From dbe2c68b3a910febb29cc6c31a9f6da140a63055 Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Sun, 2 Mar 2008 10:59:42 -0800 Subject: [PATCH] Don't override install-info anymore. --- debian/bin/info/install-info | 5 ----- debian/changelog | 4 +++- debian/rules | 3 +-- 3 files changed, 4 insertions(+), 8 deletions(-) delete mode 100644 debian/bin/info/install-info diff --git a/debian/bin/info/install-info b/debian/bin/info/install-info deleted file mode 100644 index ff18a51c3a2..00000000000 --- a/debian/bin/info/install-info +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -# Dummy script to fool emacs install into thinking it did something useful. - -exit 0 diff --git a/debian/changelog b/debian/changelog index b6a1700b159..5e8faf9c3fe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,7 +16,9 @@ emacs22 (22.1+1-3) unstable; urgency=low (#455432) and a bug introduced by an incomplete initial patch (#456235). - -- Rob Browning Sun, 24 Feb 2008 21:52:24 -0800 + * Don't override install-info anymore. (closes: #438695) + + -- Rob Browning Sun, 02 Mar 2008 10:55:51 -0800 emacs22 (22.1+1-2) unstable; urgency=low diff --git a/debian/rules b/debian/rules index 9d78b47570c..18a17c3f096 100755 --- a/debian/rules +++ b/debian/rules @@ -303,7 +303,7 @@ endef # INSTALL_STRIP="-s" to the make vars below. emacs_inst = (cd debian/$(1) && \ - PATH=$(CURDIR)/debian/bin/info:$(PATH) $(MAKE) install \ + $(MAKE) install \ DESTDIR=$(2) \ infodir=/usr/share/info/emacs-$(major_ver) \ localstatedir=/var \ @@ -562,7 +562,6 @@ debian/stamp/setup: debian/stamp/patch $(checkdir) cp /usr/share/misc/config.sub . cp /usr/share/misc/config.guess . - $(pf); find debian/bin -type f | xargs chmod 775 mkdir -p $(dir $@) && touch $@ # common configure flags -- 2.30.2